From 99365753bf8cef94774761bf717945ba9ead21ed Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Sat, 9 Jan 2016 18:03:26 +0100
Subject: [PATCH] Adwaita: shortcut window related fixes

---
 gtk/theme/Adwaita/_common.scss           | 37 ++++++++++++++++++------
 gtk/theme/Adwaita/gtk-contained-dark.css | 30 ++++++++++++++-----
 gtk/theme/Adwaita/gtk-contained.css      | 30 ++++++++++++++-----
 3 files changed, 72 insertions(+), 25 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 2e00a326eb..d644d41b57 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -2608,7 +2608,7 @@ progressbar {
 
   &.vertical {
     trough,
-    progress { min-width: 2px; } 
+    progress { min-width: 2px; }
   }
 
   &.horizontal progress { margin: 0 -1px; } // the progress node is positioned after the trough border
@@ -3706,14 +3706,28 @@ button.circular { // FIXME: aggregate to buttons
   label { padding: 0; }
 }
 
-frame.keycap {
-  background-color: #fefefe;
-  border: 1px solid #cecece;
+// shortcut window keys
+.keycap {
+  min-width: 20px;
+  min-height: 25px;
+  padding-bottom: 3px;
+  padding-left: 6px;
+  padding-right: 6px;
+
+  color: if($variant == 'light', $insensitive_fg_color, $fg_color);
+  background-color: $base_color;
+  border: 1px solid;
+  border-color: if($variant == 'light', mix($borders_color, $bg_color, 50%), $borders_color);
   border-radius: 5px;
-  box-shadow: 0px 1px 0px #fff inset,
-              0px -2px 0px #dedede inset;
-  color: #555753;
-  padding: 3px 8px 3px 8px;
+  box-shadow: if($variant == 'light', inset 0 -3px mix($base_color, $bg_color, 20%), inset 0 -3px mix($borders_color, $base_color, 60%));
+  font-size: smaller;
+
+  &:backdrop {
+    background-color: $backdrop_base_color;
+    color: if($variant == 'light', $backdrop_insensitive_color, $backdrop_fg_color);
+  }
+
+  border { border-style: none; }
 }
 
 *:drop(active):focus,
@@ -3721,4 +3735,9 @@ frame.keycap {
 
 stackswitcher button.text-button { min-width: 100px; } // FIXME aggregate with buttons
 
-stackswitcher button.circular { min-width: 0px; } // FIXME aggregate with buttons
+stackswitcher button.circular,
+stackswitcher button.text-button.circular { // FIXME aggregate with buttons
+  min-width: 32px;
+  min-height: 32px;
+  padding: 0;
+}
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index a47ed9ff86..c4e61aaadf 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -4672,13 +4672,24 @@ button.circular, headerbar button.circular.titlebutton,
   .titlebar button.circular.titlebutton label {
     padding: 0; }
 
-frame.keycap {
-  background-color: #fefefe;
-  border: 1px solid #cecece;
+.keycap {
+  min-width: 20px;
+  min-height: 25px;
+  padding-bottom: 3px;
+  padding-left: 6px;
+  padding-right: 6px;
+  color: #eeeeec;
+  background-color: #292929;
+  border: 1px solid;
+  border-color: #1c1f1f;
   border-radius: 5px;
-  box-shadow: 0px 1px 0px #fff inset, 0px -2px 0px #dedede inset;
-  color: #555753;
-  padding: 3px 8px 3px 8px; }
+  box-shadow: inset 0 -3px #212323;
+  font-size: smaller; }
+  .keycap:backdrop {
+    background-color: #2c2c2c;
+    color: #949796; }
+  .keycap border {
+    border-style: none; }
 
 *:drop(active):focus,
 *:drop(active) {
@@ -4691,8 +4702,11 @@ stackswitcher .titlebar button.text-button.titlebutton,
 
 stackswitcher button.circular,
 stackswitcher .titlebar button.circular.titlebutton,
-.titlebar stackswitcher button.circular.titlebutton {
-  min-width: 0px; }
+.titlebar stackswitcher button.circular.titlebutton,
+stackswitcher button.text-button.circular {
+  min-width: 32px;
+  min-height: 32px;
+  padding: 0; }
 
 /* GTK NAMED COLORS
    ----------------
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index cdacc219ae..11f65dba34 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -4849,13 +4849,24 @@ button.circular, headerbar button.circular.titlebutton,
   .titlebar button.circular.titlebutton label {
     padding: 0; }
 
-frame.keycap {
-  background-color: #fefefe;
-  border: 1px solid #cecece;
+.keycap {
+  min-width: 20px;
+  min-height: 25px;
+  padding-bottom: 3px;
+  padding-left: 6px;
+  padding-right: 6px;
+  color: #8b8e8f;
+  background-color: #ffffff;
+  border: 1px solid;
+  border-color: #c3c3c0;
   border-radius: 5px;
-  box-shadow: 0px 1px 0px #fff inset, 0px -2px 0px #dedede inset;
-  color: #555753;
-  padding: 3px 8px 3px 8px; }
+  box-shadow: inset 0 -3px #ededec;
+  font-size: smaller; }
+  .keycap:backdrop {
+    background-color: white;
+    color: #c3c3c0; }
+  .keycap border {
+    border-style: none; }
 
 *:drop(active):focus,
 *:drop(active) {
@@ -4868,8 +4879,11 @@ stackswitcher .titlebar button.text-button.titlebutton,
 
 stackswitcher button.circular,
 stackswitcher .titlebar button.circular.titlebutton,
-.titlebar stackswitcher button.circular.titlebutton {
-  min-width: 0px; }
+.titlebar stackswitcher button.circular.titlebutton,
+stackswitcher button.text-button.circular {
+  min-width: 32px;
+  min-height: 32px;
+  padding: 0; }
 
 /* GTK NAMED COLORS
    ----------------
-- 
2.30.2